Need to do the GTK_DISABLE_DEPRECATED #undef/#define dance here, too,

2008-06-17  Tor Lillqvist  <tml@novell.com>

	* gtk/gtknotebook.c: Need to do the GTK_DISABLE_DEPRECATED
	#undef/#define dance here, too, because
	gtk_notebook_set_group_id() is deprecated but used here before it
	is defined, and gcc complains about conflicting type from the
	implicit int declaration when it sees the actual void definition.

svn path=/trunk/; revision=20435

diff --git a/ChangeLog b/ChangeLog
index 6cd3a97204deb12fc3091cf064140709a5b463a3..634aef7c39fd6fc3022a7e0ec4cb54bdab09ec63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-06-17  Tor Lillqvist  <tml@novell.com>
 
+       * gtk/gtknotebook.c: Need to do the GTK_DISABLE_DEPRECATED
+       #undef/#define dance here, too, because
+       gtk_notebook_set_group_id() is deprecated but used here before it
+       is defined, and gcc complains about conflicting type from the
+       implicit int declaration when it sees the actual void definition.
+
        * modules/input/gtkimcontextime.h: Don't use the deprecated GTK_*
        GtkType macros.
 

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 9a1c26eb92af348a52d24d6d0deab85a4a6aa4af..1ad9439657c015ea50b0bdf34b20ff78863128c4 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -26,20 +26,27 @@
  */
 
 #include <config.h>
+
+#include <stdio.h>
 #include <string.h>
+
+#include <gdk/gdkkeysyms.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gtknotebook.h"
 #include "gtkmain.h"
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
 #include "gtklabel.h"
-#include <gdk/gdkkeysyms.h>
-#include <stdio.h>
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkbindings.h"
 #include "gtkprivate.h"
 #include "gtkdnd.h"
 #include "gtkbuildable.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 #define SCROLL_DELAY_FACTOR   5